From: Michael Albinus Date: Sat, 4 Jun 2011 14:11:26 +0000 (+0200) Subject: * net/tramp-sh.el (tramp-find-shell): Apply workaround also for X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3557 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=89c5e30193d80d40fed3cf4fde5d2dc9bf077428;p=emacs.git * net/tramp-sh.el (tramp-find-shell): Apply workaround also for "SunOS 5.10". --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 579eef6adeb..69df81bb08d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-04 Michael Albinus + + * net/tramp-sh.el (tramp-find-shell): Apply workaround also for + "SunOS 5.10". + 2011-06-04 Michael Albinus * net/tramp.el (tramp-set-completion-function, tramp-parse-rhosts) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 4ac523a2a17..025b4ab6cf3 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3641,9 +3641,11 @@ file exists and nonzero exit status otherwise." (tramp-send-command vec "echo ~root" t) (cond ((or (string-match "^~root$" (buffer-string)) - ;; The default shell (ksh93) of OpenSolaris is buggy. - (string-equal (tramp-get-connection-property vec "uname" "") - "SunOS 5.11")) + ;; The default shell (ksh93) of OpenSolaris and Solaris + ;; is buggy. We've got reports for "SunOS 5.10" and + ;; "SunOS 5.11" so far. + (string-match (regexp-opt '("SunOS 5.10" "SunOS 5.11")) + (tramp-get-connection-property vec "uname" ""))) (setq shell (or (tramp-find-executable vec "bash" (tramp-get-remote-path vec) t t)